Set the shaped flag here, too. (#316871)

2005-09-26  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkwindow-win32.c (gdk_window_shape_combine_mask): Set
	the shaped flag here, too. (#316871)
	(gdk_window_shape_combine_region): Currently unimplemented, so
	don't do anything to the shaped flag here.

diff --git a/ChangeLog b/ChangeLog
index b9061a618382dc942955e431a6960cde1a20ea03..9c8c051af4956a6e5affea5ff32b5f3aa3b9eb4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-26  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_shape_combine_mask): Set
+       the shaped flag here, too. (#316871)
+       (gdk_window_shape_combine_region): Currently unimplemented, so
+       don't do anything to the shaped flag here.
+
 2005-09-26  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #316871, reported by Dan Winship:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b9061a618382dc942955e431a6960cde1a20ea03..9c8c051af4956a6e5affea5ff32b5f3aa3b9eb4f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-09-26  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_shape_combine_mask): Set
+       the shaped flag here, too. (#316871)
+       (gdk_window_shape_combine_region): Currently unimplemented, so
+       don't do anything to the shaped flag here.
+
 2005-09-26  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #316871, reported by Dan Winship:

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 5c2f5a095ea4b3ba984d841587f1129b7a0045d9..2eb5ba28f630f40a27ee49287587da0b091941d6 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -2363,7 +2363,8 @@ gdk_window_shape_combine_mask (GdkWindow *window,
                               GdkBitmap *mask,
                               gint x, gint y)
 {
-  g_return_if_fail (window != NULL);
+  GdkWindowObject *private = (GdkWindowObject *)window;
+
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   if (!mask)
@@ -2371,6 +2372,8 @@ gdk_window_shape_combine_mask (GdkWindow *window,
       GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %p: none\n",
                               GDK_WINDOW_HWND (window)));
       SetWindowRgn (GDK_WINDOW_HWND (window), NULL, TRUE);
+
+      private->shaped = FALSE;
     }
   else
     {
@@ -2398,6 +2401,8 @@ gdk_window_shape_combine_mask (GdkWindow *window,
        }
       
       SetWindowRgn (GDK_WINDOW_HWND (window), hrgn, TRUE);
+
+      private->shaped = TRUE;
     }
 }